Removed unwanted file-handlers