remove unused methods
adapt incorrectly changed code