cleaning up code, removing deps