* Move `resources/lang` folder
* Shift registered middleware
* Remove `fruitcake/laravel-cors` dependency
* Streamline `$commands` property
* Upgrade to Flysystem 3.0
* Shift core files
* Convert `optional()` to nullsafe operator
* Remove unnecessary `$model` property
* Convert route options to fluent methods
Laravel 8 adopts the tuple syntax for controller actions. Since the old options array is incompatible with this syntax, Shift converted them to use modern, fluent methods.
* Convert deprecated `$dates` property to `$casts`
* Shift config files
* Default config files
In an effort to make upgrading the constantly changing config files
easier, Shift defaulted them and merged your true customizations -
where ENV variables may not be used.
* Bump Laravel dependencies
* Use `<env>` tags for configuration
`<env>` tags have a lower precedence than system environment variables making it easier to overwrite PHPUnit configuration values in additional environments, such a CI.
Review this blog post for more details on configuration precedence when testing Laravel: https://jasonmccreary.me/articles/laravel-testing-configuration-precedence/
* Fix error provider
* Match new symfony syntax
* Match upstream syntax
* Fix route syntax
* generate composer.lock
* Sync back configs
* routes
* composer
* Fix more flare
* fix cors
* sync lang
* Apply fixes from StyleCI (#14517)
Co-authored-by: StyleCI Bot <bot@styleci.io>
* bump larastan
* update packages
* wip
* Temporarily lower phpstan level
* Update phpstan.neon
* wip
* wip
* wip
* Apply fixes from StyleCI (#14592)
Co-authored-by: StyleCI Bot <bot@styleci.io>
* test
* Update CiHelper.php
* Update test.yml
* Update CiHelper.php
* Update CiHelper.php
* Apply fixes from StyleCI (#14616)
Co-authored-by: StyleCI Bot <bot@styleci.io>
* test?
* fix phpstan problems
* dont run snmpsim on github ci
* Fix whitespace
* More whitespace
* More whitespace ???
* I think the space broke it
* fix the reset of the whitespace
* hard code auth guard
---------
Co-authored-by: Shift <shift@laravelshift.com>
Co-authored-by: StyleCI Bot <bot@styleci.io>
Co-authored-by: Tony Murray <murraytony@gmail.com>
* Solves error discovering services module
* Removing trailing spaces
* Allow in device group scopes to accept an array
* Fix and optimize queries a little
---------
Co-authored-by: Tony Murray <murraytony@gmail.com>
* use component to discover if xDSL polling is needed
use component to discover if xDSL polling is needed
* Components OK, Polling in correct files, no DB for VDSL
* GUI
GUI_suite
* per port as well
* rename
* interface listing
* draytek_snmpsim
* fix arraymerge
fix names and max value
* schema
schema
style
* remove one dbFetchRows
remove 2x dbFetchCell
style
style
remove Legacy dbFetchRow
tests
tests
eloquent
more eloquent
more eloquent
one more gone
* fix properties access
eloquent_insert_update
style
tests
tests
tests
tests
* tests
tests
tests
* adslLineCoding
* Models
* fix not nullable cols in DB from code
default values
typo
rename
typo
schema
fix
fix
vdsl fix now
typo
typo
fix size
fix size
* Power values for VDSL
Power values for VDSL
Power values for VDSL
DB
* cleanup
* Rrd::checkRrdExists
* always enable DSL discovery
style
* xdsl module
* cleanup and move to Module
cleanup and move to Module
cleanup and move to Module
cleanup and move to Module
* Fix display
* fix polling and tenth
* remove legacy poller
* Style and Cosmetics
Cosmetics
Cleanup
* Translations
Translations
* exists
exists
* add test support for xdsl
* remove last component call
unused
* translations
* remove non standard onclick event on xdsl line
* Update Discovery Support.md
Update Poller Support.md
toner_gone
* Notification for removal of lnms config:set enable_ports_adsl true
* enable on devices with potential DSL interfaces
* tests are working now
fix teldat tests
* os_schema
* teldat
* move to new module structure
* move to new module structure
* wrong dump function
* wrong dump function
* laravel_through_key hidden
* Update notifications.rss
* Update notifications.rss
Co-authored-by: Tony Murray <murraytony@gmail.com>
* Improve the efficiency of some queries
Mostly by switching from whereIn to whereIntegerInRaw.
This inserts integers directly into the query instead of using placeholders (also escapes them)
also remove extra json_encode/json_decode in PingCheck
* Fix return types
Probably will result in some missing baseline exceptions.
* Update PingCheck.php
* whitespace
* New device:add code
pre-requisite for updating other code paths
includes option to set display name
separate validation code from device creation
* remove duplicate community and v3 creds
* style fixes
* some lint fixes
* fix phpstan
* Exception cleanup
improved messages and translations
* port association mode to enum
well, pseudo enum
* defaults and cleanups
* fixed/improved validation messages
* fix tests
* fix stupid ide refactor mistake
* lint fixes
* STP module rewrite WIP
* Finish rewrite
* Ignore disabled and log root/topology changes
* Remove interfaces for now
* fix style
* Lint fixes
* Document ResolvesPortIds and hide map functions
* whitespace fixes
* Revert to stpInstances in case someone writes mstp support
* missed one
* phpstan fixes
* Handle table and oids separately
* forgot to register observer
* Test data and correct non-table handling in SnmpResponse->table()
* update test
* test data
* revert aos7 silly things
* minimal polling
* Update test data
* order ports_ntp and rename new field to port_index
* forgot the db_schema
* revert ciena-sds port things
* MSTP support, maybe
* Adding test data
* Filter bad lines instead of discarding the entire snmp response
and capture fixes and test data
* fresh data
* add os data
* update data, ignore unfound ports, obviously bad device implementation.
* fixes
* Ignore context files in os detection test
* Remove empty table data
* add ciena-sds vlan
* designatedCost column is too small
* Update stp webui
* Refactor code to interfaces, to allow vendor mibs
* update schema
* fix issues added by abstraction
* STP fixes
* Default to no context for vlan 1
* never store vlan 1
* Update test data
* remove eltex brokenness
* fix style
* fix stan
* Fix Rewrite MAC to Hex padding with floats
* fix sqlite migration
* Oxidized + Device remove
Was just working on oxidized, but then to properly update nodes after delete, updated delete_device()
* revert dumb style changes
* baseline update and no DI there...
* Fix OS first load and device deletion missing tables
* Configurable device display name
You can just set the display name in device settings.
It also accepts simple template format with the variables: hostname, sysName, sysName_fallback, ip
Default controlled by device_display_default, (set from old force_hostname_to_sysname and force_ip_to_sysname settings
* remove second argument to format_hostname()
* Style fixes
* Update schema
* update phpstan baseline
* Improved settings strings (and add for translation)
* Fix net-snmp unformatted strings
When net-snmp returns an unformatted string (with quotes around it), it also has backslashes to escape certain characters. Remove those.
* Clean up sysDescr and sysName when setting to Device model.
* Lint fixes
* Hmm, additional formatting spots
Seems that uptime is not fillable, but it used in the new rewrite of Core Module. This fixes it. A few devices in my master instance failed with uptime
* Core module WIP
* update OS::make()
* core WIP
* try to finish up
* switch all core do os Model
* Mock WIP
* Working tests
* cleanup
* phpstan fixes
* style fixes
* fix agent
* trim space too
and a couple of cleanups
* corrected ios test data
* missed space
* update test data
* put escapes back
* another net-snmp difference
* Fix class description
* revert snmp.inc.php change, that can be a different PR
* revert snmp.inc.php change, that can be a different PR
* Fping WIP
* Update availability, move ping rrd update in the same place as db update.
* move classes around
* make device:ping command work
* use new code, remove legacy code
* save metrics boolean prevents all saves
style fixes
* update device array
* style fixes
* Update unit test
* fix whitespace
* Fix Fping stub
* fix backwards if
* fix phpstan complaining
* Fix return type
* add fillable to DeviceOutage model.
* device_outage migration to add id...
* missed line in db_schema.yaml
* 1 billion more comments on the brain damage up/down code
* tests for status and status_reason fields
* fix style again :D
* Duplicate legacy isSNMPable() functionality
but with only one snmp call ever 😎
* Remove unused variable
* fix migrations for sqlite
* Common contexts for polling
Don't store contexts on the device array, use the device model
Also should be easier to add different contexts later.
* rename variables for consistency
* Oxidized API cleanup
Import more settings to the UI
use lnms config:set
* validate os and type exist
* map settings WIP
* oops
* editing working. Needed to add new property to pass update state to child
* implement deleting and handle text overflow a little better.
* Update app/Models/Device.php
Co-authored-by: Jellyfrog <Jellyfrog@users.noreply.github.com>
* Update app/Models/Device.php
Co-authored-by: Jellyfrog <Jellyfrog@users.noreply.github.com>
* revert change
* fix style
* add return
Co-authored-by: Jellyfrog <Jellyfrog@users.noreply.github.com>
* GPS coords from device
in yaml or php
define for epmp, airos, and airos-af-ltu
quirk for airos bug with - in the middle of the number
* style fixes
* revert airos-af-ltu mempool change
* fix imports
* add epmp test data... more improvements to come there.
* don't stagger geocoding now that this is moved to discovery
also, no need to check OSDiscovery since the base implements it.
* fix json data
* fixed
* service templates - move to blade - jellyfrog fixes - revert get to find and fix discovery lookup
* service templates - move to blade - wip
* service templates - move to blade - wip
* service templates - move to blade - deprecate delete_service_template
* service templates - move to blade - deprecate delete_service_template
* service templates - move to blade - deprecate remove_service_template
* service templates - move to blade - deprecate remove_service_template
* service templates - move to blade - fix permisson lookup
* service templates - move to blade - fix remove route
* service templates - move to blade - fix remove route
* service templates - move to blade - fix permisson lookup
* service templates - move to blade - fix permisson lookup
* service templates - move to blade - fix permisson lookup
* service templates - move to blade - fix permisson lookup
* service templates - move to blade - fixs
* service templates - move to blade - fixes
* service templates - move to blade - fixes
* service templates - move to blade - fixes
* service templates - move to blade - nullable input?
* service templates - move to blade - nullable input?
* service templates - move to blade - nullable input?
* service templates - move to blade - add selected for device group id and type
* service templates - move to blade - add selected for device group id and type
* service templates - move to blade - add selected for device group id and type
* service templates - move to blade - fix discovery response
* service templates - move to blade - fix device group index display
* service templates - move to blade - add delete to discover_service_template
* service templates - move to blade - add discover all button - function foobar
* service templates - move to blade - add discover all button - function foobar
* service templates - move to blade - add discover all button - function foobar
* service templates - move to blade - fixes
* service templates - move to blade - fixes
* service templates - move to blade - fixes
* service templates - move to blade - button fixes
* service templates - move to blade - button fixes
* service templates - move to blade - button fixes
* service templates - move to blade - attempt route fix
* service templates - move to blade - attempt route fix
* service templates - move to blade - attempt route fix
* service templates - move to blade - attempt route fix
* service templates - move to blade - fix discovery function
* service templates - move to blade - fix discovery function
* service templates - move to blade - fix return values - thanks SourceDoctor
* service templates - move to blade - attempt route fix
* service templates - move to blade - button variable fix
* service templates - move to blade - button variable fix
* service templates - move to blade - button variable fix
* service templates - move to blade - function fix
* service templates - move to blade - permissions fix
* service templates - move to blade - permissions fix
* service templates - move to blade - permissions fix
* service templates - move to blade - permissions fix
* service templates - move to blade - permissions fix
* service templates - move to blade - permissions fix
* service templates - move to blade - permissions fix
* service templates - move to blade - permissions fix
* service templates - move to blade - permissions fix
* service templates - add initial api - and model permissions fix
* service templates - add initial api - discovery too
* service templates - add initial api - discovery too
* service templates - merge fix
* service templates - api fixes
* service templates - api fixes
* service templates - remove bad fixe
* service templates - discover null? :)
* service templates - Policy requires Facade?
* service templates - Policy requires Facade?
* service templates - REVERT Policy requires Facade?
* service templates - REVERT Policy requires Facade?
* Revert "service templates - REVERT Policy requires Facade?"
This reverts commit 7752b3e4e5.
* service templates - clean up discover api call
* service templates - clean up discover api call
* service templates - clean up discover api call
* service templates - clean up discover api call
* service templates - clean up discover api call
* service templates - attempt route fix
* Revert "service templates - attempt route fix"
This reverts commit b48970351e.
* service templates - jellyfrog fixes - DeviceGroup relates to Service Template
* service templates - jellyfrog fixes - DeviceGroup relates to Service Template
* service templates - jellyfrog fixes - DeviceGroup relates to Service Template
* service templates - jellyfrog fixes - DeviceGroup relates to Service Template
* service templates - jellyfrog fixes - DeviceGroup relates to Service Template
* service templates - jellyfrog fixes - DeviceGroup relates to Service Template
* service templates - jellyfrog fixes - dbchanged - DeviceGroup relates to Service Template
* service templates - jellyfrog fixes - dbchanged - DeviceGroup relates to Service Template
* service templates - jellyfrog fixes - dbchanged - DeviceGroup relates to Service Template
* service templates - jellyfrog fixes - dbchanged - DeviceGroup relates to Service Template
* Revert "service templates - jellyfrog fixes - dbchanged - DeviceGroup relates to Service Template"
This reverts commit ef93315db5.
* Revert "service templates - jellyfrog fixes - dbchanged - DeviceGroup relates to Service Template"
This reverts commit 73af819a60.
* Revert "service templates - jellyfrog fixes - dbchanged - DeviceGroup relates to Service Template"
This reverts commit dd019c3105.
* Revert "service templates - jellyfrog fixes - dbchanged - DeviceGroup relates to Service Template"
This reverts commit 94aaaf7976.
* service templates - jellyfrog fixes - DeviceGroup relates to Service Template
* service templates - fix permissions
* service templates - db service_templates_perms
* service templates - fix permissions
* service templates - fix permissions
* service templates - fix permissions
* service templates - fix permissions
* service templates - fix permissions
* service templates - fix edit.blade missing parameters - still 403 :(
* service templates - jellyfrog -fix route and construct
* service templates - jellyfrog -fix route and construct
* service templates - jellyfrog -fix route and construct
* Revert "service templates - jellyfrog -fix route and construct"
This reverts commit ec1eea7a99.
* service templates - jellyfrog -fix routes
* service templates - jellyfrog -fix services lookup
* service templates - edit blade fixes
* service templates - edit blade fixes - service or services or template or serviceTemplate or service_template good luck
* service templates - edit blade fixes
* service templates - index blade fixes
* service templates - discover return fix
* service templates - remove return fix
* service templates - fix discovery api returns
* service templates - fix discovery api returns
* service templates - fix discovery api returns
* service templates - fix discovery - test
* service templates - fix discovery
* service templates - fix checkbox integer
* service templates - fix checkbox integer
* service templates - fix checkbox integer
* service templates - fix checkbox integer
* service templates - fix checkbox integer
* service templates - fix discover all
* service templates - fix discover all
* service templates - fix discover all
* service templates - fix discover all
* service templates - fix discover all
* service templates - fix discover all
* service templates - fix discover all
* service templates - fix discover
* service templates - fix discover
* service templates - fix discover
* service templates - fix discover
* service templates - fix discover
* service templates - move discover/apply to blade - last of the old functions - wip
* service templates - move discover/apply to blade - last of the old functions - wip
* service templates - move discover/apply to blade - last of the old functions - wip
* service templates - change all relevant to template for sanity
* service templates - inspection fixes
* service templates - inspection fixes
* service templates - inspection fixes
* service templates - murrant fixes - use createOrUpdate - add obervers - fix function call
* service templates - murrant fixes - add ServiceController store - not used
* service templates - murrant fixes - add Observers file)
* service templates - murrant fixes - correct ServiceController
* service templates - murrant fixes - fix observers load
* service templates - observer fix
* service templates - schedule discovery function call fix, cheeky, is this allowed?
* service templates - attempt route fix.
* service templates - attempt route fix 2
* service templates - blade route applyall missing url - ie the route lol
* service templates - blade route applyall missing url - ie the route lol
* service templates - fix routes - bingo!
* service templates - fix routes - bingo!
* service templates - fix blade missing quote
* service templates - jellyfrog fix - remove pluck
* service templates - missing template id on service update
* service templates - jellyfrog fix - add get
* service templates - fix service db defaults / null
* service templates - fix service update
* service templates - fix service update
* service templates - fix service update
* service templates - fix service devicegroup change - obsoletes service_template_change in servicesdb
* service templates - fix service devicegroup change - obsoletes service_template_change in servicesdb
* Add service templates - phpcs fixes - and attemp whereNotIn scope
* Add service templates - styleci
* Add service templates - styleci
* Add service templates - fix notindevicegroup scope
* Add service templates - removed service service_template_changed - not required for delete or update
* Add service templates - removed service service_template_changed - not required for delete or update
* Add service templates - murrant fixes - add protected casts - fix checkbox
* Add service templates - fix checkbox - attempt2
* Add service templates - fix checkbox - attempt3
* Add service templates - fix checkbox - attempt3
* Add service templates - fix checkbox - attempt4
* Add service templates - fix delete row selection
* Revert "Add service templates - fix delete row selection"
This reverts commit 4d9e4990f2.
* Add service templates - fix delete row selection
* Add service templates - fix automatic discovery
* Add service templates - fix automatic discovery
* Add service templates - checkbox - add hidden input
* Add service templates - checkbox - add old value back?
* Add service templates - checkbox - fix disabled
* Add service templates - checkbox - fix disabled
* Add service templates - service fixes - styleci
* Add service templates - make devicegroup required
* Add service templates - let Disable text wrap
* Add service templates - dont allow device group to be deleted when service templates exist
* Add service templates - dont allow device group to be deleted when service templates exist
* Add service templates - enable multiple device groups - wip
* Add service templates - enable multiple device groups - wip
* Add service templates - enable multiple device groups - wip
* Add service templates - enable multiple device groups - dbschema - wip
* Add service templates - enable multiple device groups - db migration - wip
* Add service templates - enable multiple device groups - db migration - wip
* Add service templates - enable multiple device groups - wip
* Add service templates - enable multiple device groups - wip
* Add service templates - enable service template Groups - relationships to device AND device groups
* Add service templates - styleci fixes
* Add service templates - styleci fixes
* Add service templates - fixes
* Add service templates - fixes
* Add service templates - fixes
* Add service templates - fixes
* Add service templates - fixes
* Add service templates - fixes
* Add service templates - fixes
* Add service templates - fixes
* Add service templates - db - primarykey issues
* Add service templates - fix migrations
* Add service templates - fix migrations
* Add service templates - fix migrations
* Add service templates - fix migrations
* Add service templates - fix migrations
* Add service templates - fix migrations
* Add service templates - fix migrations
* Add service templates - fix migrations
* Add service templates - fix migrations
* Add service templates - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - misc update for travis build trigger
* Add service templates - restrict view to only show device/groups that have templates applied
* Add service templates - fix devicegroup update
* remove permissions table stuff
* Fix schema rollback
* fix style
* Update ServiceTemplateController.php
Co-authored-by: Tony Murray <murraytony@gmail.com>
* Shift HTTP kernel and middleware
* Shift service providers
* Shift console routes
* Shift to class based factories
* Namespace seeders
* Shift PSR-4 autoloading
* Default config files
In an effort to make upgrading the constantly changing config files
easier, Shift defaulted them. This allows you to review the commit
diff for once for customizations when you are done Shifting.
Moving forward, consider using ENV variables or create a separate
config file to allow the core config files to remain as default
as possible.
* Shift Laravel dependencies
* Shift return type of base TestCase methods
From the [PHPUnit 8 release notes][1], the `TestCase` methods below now declare a `void` return type:
- `setUpBeforeClass()`
- `setUp()`
- `assertPreConditions()`
- `assertPostConditions()`
- `tearDown()`
- `tearDownAfterClass()`
- `onNotSuccessfulTest()`
[1]: https://phpunit.de/announcements/phpunit-8.html
* Shift cleanup
* console routes
* composer update
* factories
* phpunit
* bootstrap pagination
* model factory
* wip
* Apply fixes from StyleCI (#12236)
* wip
* Apply fixes from StyleCI (#12238)
* wip
* wip
* wip
* wip
* Apply fixes from StyleCI (#12240)
* wip
* Apply fixes from StyleCI (#12242)
* composer update
* Bump to PHP 7.3 minimum
Co-authored-by: Laravel Shift <shift@laravelshift.com>
* Shift bindings
PHP 5.5.9+ adds the new static `class` property which provides the fully qualified class name. This is preferred over using class name strings as these references are checked by the parser.
* Shift core files
* Shift to Throwable
* Shift Laravel dependencies
Add laravel/ui dependency
Use our fork of string-blade-compiler
* Shift config files
Default config files
In an effort to make upgrading the constantly changing config files
easier, Shift defaulted them so you can review the commit diff for
changes. Moving forward, you should use ENV variables or create a
separate config file to allow the core config files to remain
automatically upgradeable.
Restore config header comment
* Remove duplicate named routes
* add basic trust host middleware
* Trusted proxies should be default null
* Fix missed rename
* wip
* Rename routes
* Update trustedproxy.php
* Update Kernel.php
* revert trustedproxy.php
It only accepted '*' and not ['*']
* Fix tests
fake request was causing the error
Co-authored-by: Laravel Shift <shift@laravelshift.com>
Co-authored-by: Tony Murray <murraytony@gmail.com>
* fix
* fix widget
* fix widget
* fix widget
* fix
* last_polled fix
* factorize down / up time device
* factorize down / up time device
* factorize down / up time device
* factorize down / up time device
* factorize down / up time device
* Intitial push working tests
* Adding unit tests
* created interface state unit tests
* started ospf nbr unit tests
* finished nbr change unit tests
* precommit checks pass
* removed uneccsarry relationship
* Ping only device doesn't display
if os was set to something, ping os wasn't loaded and we try to get overview graphs from it.
* Fix snmp_disable device page load error
When other os is set.
* Revamp os setting loading
the only safe way to access is Config::getOsSetting()
* Remove getOsSetting fallback behavior
Most instances don't use it and it can have unexpected results Config::getOsSetting('blah', 'group') == 'librenms'
* refactor and remove unneeded load_os/loadOs calls now since getOsSetting automatically loads it.
* restore unix overview graphs, they are different
small cleanups
* fix
* Implement OS specific information discovery
That way it doesn't have to be fetched during polling
Also improve discovery process, os is only detected once, in the core module.
EXA is the test os, a couple improvements there.
* Use local variable, then unset it so we don't pollute.
* fix style issues
* test and other fixes
* attribute update fixes
* Update exa data, need new source data
* null missing "os" values
* fix ftos odd character
* fix ftos odd character
* only null for new style or we will reset to null every discovery
* Move device observer to own class
* Handle location, relocate event logging
* update exa e7-2 data
* update ird test data, apparently unicode is now working.
* update Linux ntc, now uses correct icon
* Only load all os on the web, also, we can't load existing the the database isn't connected.
* only for devices that have a location
* revert ftos test data apparently
* revert ird
* Throw some shit together, rough outline.
* Reorganize tabs, use tab controllers
* Implement performance (into the latency tab)
* Update resources/views/device/header.blade.php
Co-Authored-By: Jellyfrog <Jellyfrog@users.noreply.github.com>
* Add more tabs
* All controllers created
* Implement routes
* Implement smokeping
* routing and auth
* fix smokeping check
* Implement device dropdown menu
* Update deviceUrl to new style
* Use Gates
* Fix style
* use more appropriate gates
* add show-config gate
remove Laravel helper
* Only show vlan tab if VLANs exist for the device :D
* Fix rancid file check will return false
* revert over-zealous file name changes
* don't need to request the location parameter, just cast to string to avoid bugs when not found
* Move latency tab (ping/performance) to the position of performance instead of ping.
Co-authored-by: Jellyfrog <Jellyfrog@users.noreply.github.com>
* Use model::class instead of string for binding
Originally from laravel shift
Shift bindings
PHP 5.5.9+ adds the new static `class` property which provides the fully qualified class name. This is preferred over using class name strings as these references are checked by the parser.
* Shift cleanup
