Removed not needed stuff