Beginning: Removed some blocks of code