Cleaned up code, removed all cube stuff.