removed useless methods, some cleaning up