Cleanup of unused empty methods