Removed temporary fixes