removed uneeded subroutines inline