remove unused methods
changes
merge fixes