Removing some methods to optimize the script