Removed leftover file
Fixed bug that crashed process when --serve'ing
Merge branch 'hotfix'