Removed comments and unneeded modules