Removed Some useless stuff