Clean up

Syncing between Windows and Linux dev environments