reduced the number of setters/getters for better performance
removed some modules