Remove broken code from master