Removed a feature that I do not need on this commit