Cleaned up useless stuff.