Removed unnecessary libraries and filters