Removed conflicting TAP definition