Removed module from repo and small cleanup