Remove unused files, cleanup code
Add limit functionality for checkbox(es)