Removed extension and tidy up.