Remove

File cleanup and monitor refactor