Removed (some) placeholder code