* remove unused methods
* remove unnecessary null checks