Code cleanup and optimization

* Started work on RWD
* Removed some junk files