Removed needless stuff