Removed all the evil spinner code