Removed obnoxious code - may fix later