Removed all that excess garbage