Dev: Clean up