Some more cleaning up performed