Removed some code from build until properly tested