Cleaning up eclipse's derpiness