Removed unnecessary static objects to clean heap