Removed graphic artifact and some unused code