Removes unused code
Implements compact design