cleanup, removing methods and fixing tests