cleanup, removing dead code and images
little bug associated with cleanup