revise code and remove obsolete method stuff