updated build files, remvoed unused imports