Removed unused methods/files

ok