Remove unused methods and reduce class and constructor visibility