Remove "After" from method names - not needed after all...