Removed Un-used Class, and Fixed Paint