Fixed minor bugs and cleanup

Removed errors with config.yml and removed classes from source folder