Removed not needed stuff - Smaller size