Removed all unused stuff