Removed module, contructor and other non necessary sections