Cleanup of leftover files from previous commit