Removed untested parts