Removed unused constants
Removed more redundant stuff
Introduced a Sandbox class
More redundant code removal