Clean up
Remove non-sense