Removed old compile methods
Merge remote-tracking branch 'upstream/develop' into feature/logging