Removed loggers for submission; Updated make files